RF-13224: fix optimized resource creation