Azilroka:
	- Issue #299
	- Issue #301
