#26 GIBS-471 Fixed and optimized handling of month periods